tdf#125372 writer, file with lots of hints very slow to open, part8
Takes load time from 22s to 15.5s
sw::mark::IMark does not need to be held by shared_ptr - we have one
vector, which holds all marks we created, and when we remove from that
vector, which remove the other references too.
Change-Id: Ie6d287d9d825f7129855b64a34afa81a2ef9c378
Reviewed-on: https://gerrit.libreoffice.org/73206
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 19431c6..cbdaa7b 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -52,8 +52,7 @@
NAVIGATOR_REMINDER
};
typedef std::shared_ptr< ::sw::mark::IMark> pMark_t;
typedef std::vector< pMark_t > container_t;
typedef std::vector< ::sw::mark::IMark* > container_t;
typedef container_t::iterator iterator_t;
typedef container_t::const_iterator const_iterator_t;
typedef container_t::const_reverse_iterator const_reverse_iterator_t;
@@ -184,7 +183,7 @@
@param ppMark
[in] an iterator pointing to the Mark to be deleted.
*/
virtual std::shared_ptr<ILazyDeleter>
virtual std::unique_ptr<ILazyDeleter>
deleteMark(const IDocumentMarkAccess::const_iterator_t& ppMark) =0;
/** Deletes a mark.
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 20ac02c..6b18e67 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1615,9 +1615,9 @@
SwTextNode& rParaNode2 = dynamic_cast<SwTextNode&>(aIdx.GetNode());
rParaNode2.JoinNext();
}
::sw::mark::IMark* pBM1 = pMarksAccess->findMark("Para1")->get();
::sw::mark::IMark* pBM2 = pMarksAccess->findMark("Para2")->get();
::sw::mark::IMark* pBM3 = pMarksAccess->findMark("Para3")->get();
::sw::mark::IMark* pBM1 = *pMarksAccess->findMark("Para1");
::sw::mark::IMark* pBM2 = *pMarksAccess->findMark("Para2");
::sw::mark::IMark* pBM3 = *pMarksAccess->findMark("Para3");
CPPUNIT_ASSERT_EQUAL(sal_Int32(0) , pBM1->GetMarkStart().nContent.GetIndex());
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), pBM1->GetMarkEnd().nContent.GetIndex());
@@ -1652,9 +1652,9 @@
aPaM.GetMark()->nContent += 6;
m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM);
}
pBM1 = pMarksAccess->findMark("Para1")->get();
pBM2 = pMarksAccess->findMark("Para2")->get();
pBM3 = pMarksAccess->findMark("Para3")->get();
pBM1 = *pMarksAccess->findMark("Para1");
pBM2 = *pMarksAccess->findMark("Para2");
pBM3 = *pMarksAccess->findMark("Para3");
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pBM1->GetMarkStart().nContent.GetIndex());
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM1->GetMarkEnd().nContent.GetIndex());
@@ -1688,9 +1688,9 @@
aPos.nContent += 8;
m_pDoc->getIDocumentContentOperations().SplitNode(aPos, false);
}
pBM1 = pMarksAccess->findMark("Para1")->get();
pBM2 = pMarksAccess->findMark("Para2")->get();
pBM3 = pMarksAccess->findMark("Para3")->get();
pBM1 = *pMarksAccess->findMark("Para1");
pBM2 = *pMarksAccess->findMark("Para2");
pBM3 = *pMarksAccess->findMark("Para3");
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pBM1->GetMarkStart().nContent.GetIndex());
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM1->GetMarkEnd().nContent.GetIndex());
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index e487a07..012e16e 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -1070,7 +1070,7 @@
// Check whether all fieldmarks are text form fields
for(auto aIter = pMarkAccess->getAllMarksBegin(); aIter != pMarkAccess->getAllMarksEnd(); ++aIter)
{
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pFieldmark);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString(ODF_FORMTEXT), pFieldmark->GetFieldname());
}
@@ -1128,7 +1128,7 @@
int nIndex = 0;
for(auto aIter = pMarkAccess->getAllMarksBegin(); aIter != pMarkAccess->getAllMarksEnd(); ++aIter)
{
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
if(rFilterName == "Office Open XML Text") // OOXML import also generates bookmarks
{
@@ -1190,7 +1190,7 @@
int nIndex = 0;
for(auto aIter = pMarkAccess->getAllMarksBegin(); aIter != pMarkAccess->getAllMarksEnd(); ++aIter)
{
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
if(!pFieldmark)
continue;
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 7e6e209..5395afa 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -345,7 +345,7 @@
CPPUNIT_ASSERT_EQUAL(document, pos);
sal_uInt16 page, dummy;
shell->Push();
shell->GotoMark( mark->get());
shell->GotoMark( *mark );
shell->GetPageNum( page, dummy );
shell->Pop(SwCursorShell::PopMode::DeleteCurrent);
return page;
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 1e117ce..e403adb 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1666,7 +1666,7 @@
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark("Mark");
CPPUNIT_ASSERT(ppBkmk != pMarkAccess->getAllMarksEnd());
pMarkAccess->renameMark(ppBkmk->get(), "Mark_");
pMarkAccess->renameMark(*ppBkmk, "Mark_");
CPPUNIT_ASSERT(bool(pMarkAccess->findMark("Mark") == pMarkAccess->getAllMarksEnd()));
CPPUNIT_ASSERT(pMarkAccess->findMark("Mark_") != pMarkAccess->getAllMarksEnd());
rUndoManager.Undo();
@@ -1876,7 +1876,7 @@
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark("Mark");
CPPUNIT_ASSERT(ppBkmk != pMarkAccess->getAllMarksEnd());
//Modification 4
pMarkAccess->renameMark(ppBkmk->get(), "Mark_");
pMarkAccess->renameMark(*ppBkmk, "Mark_");
CPPUNIT_ASSERT(pWrtShell->IsModified());
pWrtShell->ResetModified();
CPPUNIT_ASSERT(bool(pMarkAccess->findMark("Mark") == pMarkAccess->getAllMarksEnd()));
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 7bf5df0..da18385 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1029,7 +1029,7 @@
// Check whether the fieldmark is created
auto aIter = pMarkAccess->getAllMarksBegin();
CPPUNIT_ASSERT(aIter != pMarkAccess->getAllMarksEnd());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT(pFieldmark);
CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMTEXT), pFieldmark->GetFieldname());
@@ -1067,7 +1067,7 @@
// Check whether the fieldmark is created
auto aIter = pMarkAccess->getAllMarksBegin();
CPPUNIT_ASSERT(aIter != pMarkAccess->getAllMarksEnd());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT(pFieldmark);
CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMCHECKBOX), pFieldmark->GetFieldname());
// The checkbox is not checked by default
@@ -1085,7 +1085,7 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
aIter = pMarkAccess->getAllMarksBegin();
CPPUNIT_ASSERT(aIter != pMarkAccess->getAllMarksEnd());
pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT(pFieldmark);
CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMCHECKBOX), pFieldmark->GetFieldname());
}
@@ -1106,7 +1106,7 @@
// Check whether the fieldmark is created
auto aIter = pMarkAccess->getAllMarksBegin();
CPPUNIT_ASSERT(aIter != pMarkAccess->getAllMarksEnd());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
::sw::mark::IFieldmark* pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT(pFieldmark);
CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMDROPDOWN), pFieldmark->GetFieldname());
// Check drop down field's parameters. By default these params are not set
@@ -1125,7 +1125,7 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
aIter = pMarkAccess->getAllMarksBegin();
CPPUNIT_ASSERT(aIter != pMarkAccess->getAllMarksEnd());
pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(aIter->get());
pFieldmark = dynamic_cast<::sw::mark::IFieldmark*>(*aIter);
CPPUNIT_ASSERT(pFieldmark);
CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMDROPDOWN), pFieldmark->GetFieldname());
}
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 543ecab..2744c1a 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -66,13 +66,13 @@
SwCursorSaveState const m_aSaveState;
};
bool lcl_ReverseMarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
bool lcl_ReverseMarkOrderingByEnd(const ::sw::mark::IMark* pFirst,
const ::sw::mark::IMark* pSecond)
{
return rpFirst->GetMarkEnd() > rpSecond->GetMarkEnd();
return pFirst->GetMarkEnd() > pSecond->GetMarkEnd();
}
bool lcl_IsInvisibleBookmark(const IDocumentMarkAccess::pMark_t& pMark)
bool lcl_IsInvisibleBookmark(const ::sw::mark::IMark* pMark)
{
return IDocumentMarkAccess::GetType(*pMark) != IDocumentMarkAccess::MarkType::BOOKMARK;
}
@@ -218,7 +218,7 @@
{
continue;
}
aCursorSt.SetCursorToMark(ppMark->get());
aCursorSt.SetCursorToMark(*ppMark);
if(!aCursorSt.RollbackIfIllegal())
break; // found legal move
}
@@ -263,7 +263,7 @@
{
continue;
}
aCursorSt.SetCursorToMark(ppMark->get());
aCursorSt.SetCursorToMark(*ppMark);
if(!aCursorSt.RollbackIfIllegal())
break; // found legal move
}
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 6d8a8b8..277eb4f 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -240,7 +240,7 @@
ppBkmk != ppBkmkEnd;
++ppBkmk)
{
const ::sw::mark::IMark* pBkmk = ppBkmk->get();
const ::sw::mark::IMark* pBkmk = *ppBkmk;
bool bMarkPosEqual = false;
if(pBkmk->GetMarkPos().nNode.GetIndex() == nNode
&& pBkmk->GetMarkPos().nContent.GetIndex() <= nContent)
@@ -273,7 +273,7 @@
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
for (const MarkEntry& aEntry : m_aBkmkEntries)
{
if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aEntry.m_nIdx].get()))
if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aEntry.m_nIdx]))
{
SwPosition aNewPos(GetRightMarkPos(pMark, aEntry.m_bOther));
rUpdater(aNewPos, aEntry.m_nContent);
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index f15bb96..a49fcd7 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -237,7 +237,7 @@
ppMark != pSrcMarkAccess->getAllMarksEnd();
++ppMark )
{
const ::sw::mark::IMark* const pMark = ppMark->get();
const ::sw::mark::IMark* const pMark = *ppMark;
const SwPosition& rMarkStart = pMark->GetMarkStart();
const SwPosition& rMarkEnd = pMark->GetMarkEnd();
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 65f0319..b9e0e70 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -95,7 +95,7 @@
ppMark != rMarkAccess.getAllMarksEnd();
++ppMark)
{
if (::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< ::sw::mark::DdeBookmark*>(ppMark->get()))
if (::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< ::sw::mark::DdeBookmark*>(*ppMark))
{
if (
(bCaseSensitive && (pBkmk->GetName() == sNameLc)) ||
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 096c6ab..828e5bd 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -77,11 +77,11 @@
&& rPos.nContent < pIdx->GetIndex() );
}
bool lcl_MarkOrderingByStart(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
bool lcl_MarkOrderingByStart(const ::sw::mark::IMark* pFirst,
const ::sw::mark::IMark* pSecond)
{
auto const& rFirstStart(rpFirst->GetMarkStart());
auto const& rSecondStart(rpSecond->GetMarkStart());
auto const& rFirstStart(pFirst->GetMarkStart());
auto const& rSecondStart(pSecond->GetMarkStart());
if (rFirstStart.nNode != rSecondStart.nNode)
{
return rFirstStart.nNode < rSecondStart.nNode;
@@ -92,8 +92,8 @@
{
return nFirstContent < nSecondContent;
}
auto *const pCRFirst (dynamic_cast<::sw::mark::CrossRefBookmark const*>(rpFirst.get()));
auto *const pCRSecond(dynamic_cast<::sw::mark::CrossRefBookmark const*>(rpSecond.get()));
auto *const pCRFirst (dynamic_cast<::sw::mark::CrossRefBookmark const*>(pFirst));
auto *const pCRSecond(dynamic_cast<::sw::mark::CrossRefBookmark const*>(pSecond));
if ((pCRFirst == nullptr) == (pCRSecond == nullptr))
{
return false; // equal
@@ -101,14 +101,14 @@
return pCRFirst != nullptr; // cross-ref sorts *before*
}
bool lcl_MarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
bool lcl_MarkOrderingByEnd(const ::sw::mark::IMark* pFirst,
const ::sw::mark::IMark* pSecond)
{
return rpFirst->GetMarkEnd() < rpSecond->GetMarkEnd();
return pFirst->GetMarkEnd() < pSecond->GetMarkEnd();
}
void lcl_InsertMarkSorted(IDocumentMarkAccess::container_t& io_vMarks,
const IDocumentMarkAccess::pMark_t& pMark)
::sw::mark::IMark* pMark)
{
io_vMarks.insert(
lower_bound(
@@ -162,11 +162,11 @@
struct CompareIMarkStartsBefore
{
bool operator()(SwPosition const& rPos,
std::shared_ptr<sw::mark::IMark> const& pMark)
const sw::mark::IMark* pMark)
{
return rPos < pMark->GetMarkStart();
}
bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
bool operator()(const sw::mark::IMark* pMark,
SwPosition const& rPos)
{
return pMark->GetMarkStart() < rPos;
@@ -178,7 +178,7 @@
struct CompareIMarkStartsAfter
{
bool operator()(SwPosition const& rPos,
std::shared_ptr<sw::mark::IMark> const& pMark)
const sw::mark::IMark* pMark)
{
return pMark->GetMarkStart() > rPos;
}
@@ -192,8 +192,9 @@
rMarks.end(),
rPos,
CompareIMarkStartsAfter());
if(pMarkAfter == rMarks.end()) return nullptr;
return pMarkAfter->get();
if(pMarkAfter == rMarks.end())
return nullptr;
return *pMarkAfter;
};
IMark* lcl_getMarkBefore(const IDocumentMarkAccess::container_t& rMarks, const SwPosition& rPos)
@@ -212,11 +213,11 @@
rMarks.begin(),
pCandidatesEnd,
back_inserter(vCandidates),
[&rPos] (IDocumentMarkAccess::pMark_t const& rpMark) { return !(rpMark->GetMarkEnd() < rPos); } );
[&rPos] (const ::sw::mark::IMark* pMark) { return !(pMark->GetMarkEnd() < rPos); } );
// no candidate left => we are in front of the first mark or there are none
if(vCandidates.empty()) return nullptr;
// return the highest (last) candidate using mark end ordering
return max_element(vCandidates.begin(), vCandidates.end(), &lcl_MarkOrderingByEnd)->get();
return *max_element(vCandidates.begin(), vCandidates.end(), &lcl_MarkOrderingByEnd);
}
bool lcl_FixCorrectedMark(
@@ -252,26 +253,26 @@
return false;
}
bool lcl_MarkEqualByStart(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
bool lcl_MarkEqualByStart( ::sw::mark::IMark* pFirst,
const ::sw::mark::IMark* pSecond)
{
return !lcl_MarkOrderingByStart(rpFirst, rpSecond) &&
!lcl_MarkOrderingByStart(rpSecond, rpFirst);
return !lcl_MarkOrderingByStart(pFirst, pSecond) &&
!lcl_MarkOrderingByStart(pSecond, pFirst);
}
IDocumentMarkAccess::iterator_t lcl_FindMark(
IDocumentMarkAccess::container_t& rMarks,
const IDocumentMarkAccess::pMark_t& rpMarkToFind)
const ::sw::mark::IMark* pMarkToFind)
{
IDocumentMarkAccess::iterator_t ppCurrentMark = lower_bound(
rMarks.begin(), rMarks.end(),
rpMarkToFind, &lcl_MarkOrderingByStart);
pMarkToFind, &lcl_MarkOrderingByStart);
// since there are usually not too many marks on the same start
// position, we are not doing a bisect search for the upper bound
// but instead start to iterate from pMarkLow directly
while (ppCurrentMark != rMarks.end() && lcl_MarkEqualByStart(*ppCurrentMark, rpMarkToFind))
while (ppCurrentMark != rMarks.end() && lcl_MarkEqualByStart(*ppCurrentMark, pMarkToFind))
{
if(ppCurrentMark->get() == rpMarkToFind.get())
if(*ppCurrentMark == pMarkToFind)
{
return ppCurrentMark;
}
@@ -296,7 +297,7 @@
{
// Once we reach a mark starting after the target pos
// we do not need to continue
if(ppCurrentMark->get()->GetMarkStart() > rPos)
if((*ppCurrentMark)->GetMarkStart() > rPos)
break;
if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType)
{
@@ -316,7 +317,7 @@
return find_if(
ppMarksBegin,
ppMarksEnd,
[&rName] (IDocumentMarkAccess::pMark_t const& rpMark) { return rpMark->GetName() == rName; } );
[&rName] (::sw::mark::IMark* pMark) { return pMark->GetName() == rName; } );
}
void lcl_DebugMarks(IDocumentMarkAccess::container_t const& rMarks)
@@ -327,7 +328,7 @@
ppMark != rMarks.end();
++ppMark)
{
IMark* pMark = ppMark->get();
IMark* pMark = *ppMark;
const SwPosition* const pStPos = &pMark->GetMarkStart();
const SwPosition* const pEndPos = &pMark->GetMarkEnd();
SAL_INFO("sw.core",
@@ -431,38 +432,38 @@
}
// create mark
pMark_t pMark;
std::unique_ptr<::sw::mark::IMark> pMark;
switch(eType)
{
case IDocumentMarkAccess::MarkType::TEXT_FIELDMARK:
pMark = std::shared_ptr<IMark>(new TextFieldmark(rPaM, rName));
pMark = std::make_unique<TextFieldmark>(rPaM, rName);
break;
case IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK:
pMark = std::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
pMark = std::make_unique<CheckboxFieldmark>(rPaM);
break;
case IDocumentMarkAccess::MarkType::DROPDOWN_FIELDMARK:
pMark = std::shared_ptr<IMark>(new DropDownFieldmark(rPaM));
pMark = std::make_unique<DropDownFieldmark>(rPaM);
break;
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
pMark = std::shared_ptr<IMark>(new NavigatorReminder(rPaM));
pMark = std::make_unique<NavigatorReminder>(rPaM);
break;
case IDocumentMarkAccess::MarkType::BOOKMARK:
pMark = std::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName));
pMark = std::make_unique<Bookmark>(rPaM, vcl::KeyCode(), rName);
break;
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
pMark = std::shared_ptr<IMark>(new DdeBookmark(rPaM));
pMark = std::make_unique<DdeBookmark>(rPaM);
break;
case IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK:
pMark = std::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName));
pMark = std::make_unique<CrossRefHeadingBookmark>(rPaM, vcl::KeyCode(), rName);
break;
case IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK:
pMark = std::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName));
pMark = std::make_unique<CrossRefNumItemBookmark>(rPaM, vcl::KeyCode(), rName);
break;
case IDocumentMarkAccess::MarkType::UNO_BOOKMARK:
pMark = std::shared_ptr<IMark>(new UnoMark(rPaM));
pMark = std::make_unique<UnoMark>(rPaM);
break;
case IDocumentMarkAccess::MarkType::ANNOTATIONMARK:
pMark = std::shared_ptr<IMark>(new AnnotationMark( rPaM, rName ));
pMark = std::make_unique<AnnotationMark>( rPaM, rName );
break;
}
assert(pMark.get() &&
@@ -481,21 +482,21 @@
pMarkBase->SetName( getUniqueMarkName( pMarkBase->GetName() ) );
// register mark
lcl_InsertMarkSorted(m_vAllMarks, pMark);
lcl_InsertMarkSorted(m_vAllMarks, pMark.get());
switch(eType)
{
case IDocumentMarkAccess::MarkType::BOOKMARK:
case IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK:
case IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK:
lcl_InsertMarkSorted(m_vBookmarks, pMark);
lcl_InsertMarkSorted(m_vBookmarks, pMark.get());
break;
case IDocumentMarkAccess::MarkType::TEXT_FIELDMARK:
case IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK:
case IDocumentMarkAccess::MarkType::DROPDOWN_FIELDMARK:
lcl_InsertMarkSorted(m_vFieldmarks, pMark);
lcl_InsertMarkSorted(m_vFieldmarks, pMark.get());
break;
case IDocumentMarkAccess::MarkType::ANNOTATIONMARK:
lcl_InsertMarkSorted( m_vAnnotationMarks, pMark );
lcl_InsertMarkSorted( m_vAnnotationMarks, pMark.get() );
break;
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
@@ -512,7 +513,7 @@
SAL_INFO("sw.core", "Fieldmarks");
lcl_DebugMarks(m_vFieldmarks);
return pMark.get();
return pMark.release();
}
::sw::mark::IFieldmark* MarkManager::makeFieldBookmark(
@@ -590,7 +591,7 @@
aPos.nContent.Assign(&const_cast<SwTextNode&>(rTextNode), 0);
const iterator_t ppExistingMark = lcl_FindMarkAtPos(m_vBookmarks, aPos, eType);
if(ppExistingMark != m_vBookmarks.end())
return ppExistingMark->get();
return *ppExistingMark;
const SwPaM aPaM(aPos);
return makeMark(aPaM, OUString(), eType, sw::mark::InsertMode::New);
}
@@ -669,7 +670,7 @@
ppMark != m_vAllMarks.end();
++ppMark)
{
::sw::mark::MarkBase* pMark = dynamic_cast< ::sw::mark::MarkBase* >(ppMark->get());
::sw::mark::MarkBase* pMark = dynamic_cast< ::sw::mark::MarkBase* >(*ppMark);
// correction of non-existent non-MarkBase instances cannot be done
assert(pMark);
// is on position ??
@@ -714,7 +715,7 @@
{
// is on position ??
bool bChangedPos = false, bChangedOPos = false;
::sw::mark::MarkBase* const pMark = dynamic_cast< ::sw::mark::MarkBase* >(ppMark->get());
::sw::mark::MarkBase* const pMark = dynamic_cast< ::sw::mark::MarkBase* >(*ppMark);
// correction of non-existent non-MarkBase instances cannot be done
assert(pMark);
if(&pMark->GetMarkPos().nNode.GetNode() == pOldNode)
@@ -776,7 +777,7 @@
if(IDocumentMarkAccess::GetType(**ppMark) == MarkType::NAVIGATOR_REMINDER)
continue;
::sw::mark::MarkBase* pMark = dynamic_cast< ::sw::mark::MarkBase* >(ppMark->get());
::sw::mark::MarkBase* pMark = dynamic_cast< ::sw::mark::MarkBase* >(*ppMark);
if (!pMark)
continue;
@@ -897,7 +898,7 @@
// fdo#61016 delay the deletion of the fieldmark characters
// to prevent that from deleting the marks on that position
// which would invalidate the iterators in vMarksToDelete
std::vector< std::shared_ptr<ILazyDeleter> > vDelay;
std::vector< std::unique_ptr<ILazyDeleter> > vDelay;
vDelay.reserve(vMarksToDelete.size());
// If needed, sort mark containers containing subsets of the marks
@@ -933,34 +934,34 @@
struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
{
std::shared_ptr<IMark> const m_pFieldmark;
SwDoc *const m_pDoc;
LazyFieldmarkDeleter(
std::shared_ptr<IMark> const& pMark, SwDoc *const pDoc)
std::unique_ptr<Fieldmark> m_pFieldmark;
SwDoc * m_pDoc;
LazyFieldmarkDeleter(Fieldmark* pMark, SwDoc *const pDoc)
: m_pFieldmark(pMark), m_pDoc(pDoc)
{ }
{
assert(m_pFieldmark);
}
virtual ~LazyFieldmarkDeleter() override
{
Fieldmark *const pFieldMark(
dynamic_cast<Fieldmark*>(m_pFieldmark.get()));
assert(pFieldMark);
pFieldMark->ReleaseDoc(m_pDoc);
m_pFieldmark->ReleaseDoc(m_pDoc);
}
};
std::shared_ptr<IDocumentMarkAccess::ILazyDeleter>
std::unique_ptr<IDocumentMarkAccess::ILazyDeleter>
MarkManager::deleteMark(const const_iterator_t& ppMark)
{
std::shared_ptr<ILazyDeleter> ret;
if (ppMark == m_vAllMarks.end()) return ret;
std::unique_ptr<ILazyDeleter> ret;
if (ppMark == m_vAllMarks.end())
return ret;
IMark* pMark = *ppMark;
switch(IDocumentMarkAccess::GetType(**ppMark))
switch(IDocumentMarkAccess::GetType(*pMark))
{
case IDocumentMarkAccess::MarkType::BOOKMARK:
case IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK:
case IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK:
{
IDocumentMarkAccess::iterator_t ppBookmark = lcl_FindMark(m_vBookmarks, *ppMark);
IDocumentMarkAccess::iterator_t ppBookmark = lcl_FindMark(m_vBookmarks, pMark);
if ( ppBookmark != m_vBookmarks.end() )
{
m_vBookmarks.erase(ppBookmark);
@@ -977,14 +978,14 @@
case IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK:
case IDocumentMarkAccess::MarkType::DROPDOWN_FIELDMARK:
{
IDocumentMarkAccess::iterator_t ppFieldmark = lcl_FindMark(m_vFieldmarks, *ppMark);
IDocumentMarkAccess::iterator_t ppFieldmark = lcl_FindMark(m_vFieldmarks, pMark);
if ( ppFieldmark != m_vFieldmarks.end() )
{
if(m_pLastActiveFieldmark == ppFieldmark->get())
if(m_pLastActiveFieldmark == *ppFieldmark)
ClearFieldActivation();
m_vFieldmarks.erase(ppFieldmark);
ret.reset(new LazyFieldmarkDeleter(*ppMark, m_pDoc));
ret.reset(new LazyFieldmarkDeleter(dynamic_cast<Fieldmark*>(pMark), m_pDoc));
}
else
{
@@ -996,40 +997,33 @@
case IDocumentMarkAccess::MarkType::ANNOTATIONMARK:
{
IDocumentMarkAccess::iterator_t ppAnnotationMark = lcl_FindMark(m_vAnnotationMarks, *ppMark);
IDocumentMarkAccess::iterator_t ppAnnotationMark = lcl_FindMark(m_vAnnotationMarks, pMark);
assert(ppAnnotationMark != m_vAnnotationMarks.end() &&
"<MarkManager::deleteMark(..)> - Annotation Mark not found in Annotation Mark container.");
m_vAnnotationMarks.erase(ppAnnotationMark);
}
break;
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
case IDocumentMarkAccess::MarkType::UNO_BOOKMARK:
// no special marks container
break;
}
DdeBookmark* const pDdeBookmark = dynamic_cast<DdeBookmark*>(ppMark->get());
if(pDdeBookmark)
DdeBookmark* const pDdeBookmark = dynamic_cast<DdeBookmark*>(pMark);
if (pDdeBookmark)
pDdeBookmark->DeregisterFromDoc(m_pDoc);
//Effective STL Item 27, get a non-const iterator aI at the same
//position as const iterator ppMark was
iterator_t aI = m_vAllMarks.begin();
std::advance(aI, std::distance<const_iterator_t>(aI, ppMark));
//fdo#37974
//a) a mark destructor may callback into this method.
//b) vector::erase first calls the destructor of the object, then
//removes it from the vector.
//So if the only reference to the object is the one
//in the vector then we may reenter this method when the mark
//is destructed but before it is removed, i.e. findMark still
//finds the object whose destructor is being run. Take a temp
//extra reference on the shared_ptr, remove the entry from the
//vector, and on xHoldPastErase release findMark won't find
//it anymore.
pMark_t xHoldPastErase = *aI;
m_vAllMarks.erase(aI);
// If we don't have a lazy deleter
if (!ret)
// delete after we remove from the list, because the destructor can
// recursively call into this method.
delete pMark;
return ret;
}
@@ -1046,7 +1040,7 @@
pMark->GetMarkStart(),
CompareIMarkStartsBefore());
for ( ; it != endIt; ++it)
if (it->get() == pMark)
if (*it == pMark)
{
deleteMark(it);
break;
@@ -1058,16 +1052,9 @@
ClearFieldActivation();
m_vFieldmarks.clear();
m_vBookmarks.clear();
m_vAnnotationMarks.clear();
#if OSL_DEBUG_LEVEL > 0
for(iterator_t pBkmk = m_vAllMarks.begin();
pBkmk != m_vAllMarks.end();
++pBkmk)
OSL_ENSURE( pBkmk->use_count() == 1,
"<MarkManager::clearAllMarks(..)> - a Bookmark is still in use.");
#endif
for (auto & p : m_vAllMarks)
delete p;
m_vAllMarks.clear();
}
@@ -1124,9 +1111,10 @@
const_iterator_t pFieldmark = find_if(
m_vFieldmarks.begin(),
m_vFieldmarks.end(),
[&rPos] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end()) return nullptr;
return dynamic_cast<IFieldmark*>(pFieldmark->get());
[&rPos] (const ::sw::mark::IMark* pMark) { return pMark->IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end())
return nullptr;
return dynamic_cast<IFieldmark*>(*pFieldmark);
}
void MarkManager::deleteFieldmarkAt(const SwPosition& rPos)
@@ -1134,8 +1122,9 @@
const_iterator_t pFieldmark = find_if(
m_vFieldmarks.begin(),
m_vFieldmarks.end(),
[&rPos] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end()) return;
[&rPos] (const ::sw::mark::IMark* pMark) { return pMark->IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end())
return;
deleteMark(lcl_FindMark(m_vAllMarks, *pFieldmark));
}
@@ -1233,12 +1222,12 @@
for (IDocumentMarkAccess::const_iterator_t aI = m_vFieldmarks.begin(),
aEnd = m_vFieldmarks.end(); aI != aEnd; ++aI)
{
std::shared_ptr<IMark> xI = *aI;
const SwPosition &rStart = xI->GetMarkPos();
::sw::mark::IMark* pI = *aI;
const SwPosition &rStart = pI->GetMarkPos();
if (!rPaM.ContainsPosition(rStart))
continue;
IFieldmark *pMark = dynamic_cast<IFieldmark*>(xI.get());
IFieldmark *pMark = dynamic_cast<IFieldmark*>(pI);
if (!pMark || pMark->GetFieldname() != ODF_FORMDROPDOWN)
continue;
@@ -1279,10 +1268,10 @@
const_iterator_t pAnnotationMark = find_if(
m_vAnnotationMarks.begin(),
m_vAnnotationMarks.end(),
[&rPos] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
[&rPos] (const ::sw::mark::IMark* pMark) { return pMark->IsCoveringPosition(rPos); } );
if (pAnnotationMark == m_vAnnotationMarks.end())
return nullptr;
return pAnnotationMark->get();
return *pAnnotationMark;
}
// finds the first that is starting after
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 8aa35aa..27a20a2 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1191,7 +1191,7 @@
&& (!pLayout || !pLayout->IsHideRedlines()
|| !sw::IsMarkHidden(*pLayout, **ppMark)))
{
const ::sw::mark::IMark* pBkmk = ppMark->get();
const ::sw::mark::IMark* pBkmk = *ppMark;
const SwPosition* pPos = &pBkmk->GetMarkStart();
pTextNd = pPos->nNode.GetNode().GetTextNode();
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 2e79465..e901510 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -64,7 +64,7 @@
virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) override;
// deleters
virtual std::shared_ptr<ILazyDeleter>
virtual std::unique_ptr<ILazyDeleter>
deleteMark(const const_iterator_t& ppMark) override;
virtual void deleteMark(const ::sw::mark::IMark* const pMark) override;
virtual void clearAllMarks() override;
@@ -121,7 +121,7 @@
private:
void sortSubsetMarks();
// container for all marks
// container for all marks, this container owns the objects it points to
container_t m_vAllMarks;
// additional container for bookmarks
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 3db189e..fa673eb 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -2089,7 +2089,7 @@
++ppMark)
{
//get the name
const ::sw::mark::IMark* pBkmk = ppMark->get();
const ::sw::mark::IMark* pBkmk = *ppMark;
mrSh.SwCursorShell::ClearMark();
const OUString& sBkName = pBkmk->GetName();
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 6f433b2..e5a09dd 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -661,7 +661,7 @@
IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t pMark = pMarksAccess->findAnnotationMark( pPostItField->GetName() );
return pMark != pMarksAccess->getAnnotationMarksEnd()
? pMark->get()
? *pMark
: nullptr;
}
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 751d88ad..e20c705 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -611,7 +611,7 @@
}
else
{
pMark = pMarkAccess->findMark(m_aName)->get();
pMark = *pMarkAccess->findMark(m_aName);
pPam.reset(new SwPaM(pMark->GetMarkPos()));
}
@@ -632,7 +632,7 @@
else if(m_bHadOtherPos)
{
if(!pMark)
pMark = pMarkAccess->findMark(m_aName)->get();
pMark = *pMarkAccess->findMark(m_aName);
OSL_ENSURE(pMark->IsExpanded(),
"<SwHistoryBookmark::SetInDoc(..)>"
" - missing pos on old mark");
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index c4d77b6..310113f 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -134,7 +134,7 @@
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark(sFrom);
if (ppBkmk != pMarkAccess->getAllMarksEnd())
{
pMarkAccess->renameMark( ppBkmk->get(), sTo );
pMarkAccess->renameMark( *ppBkmk, sTo );
}
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 1d9facd..ac36268 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1070,7 +1070,7 @@
// #i81002#
bool bSavePos = false;
bool bSaveOtherPos = false;
const ::sw::mark::IMark* pBkmk = (pMarkAccess->getAllMarksBegin() + n)->get();
const ::sw::mark::IMark* pBkmk = pMarkAccess->getAllMarksBegin()[n];
if( DelContentType::CheckNoCntnt & nDelContentType )
{
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 9e9db5e..dcc16bd7 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1601,7 +1601,7 @@
{
uno::Any aRet;
const uno::Reference< text::XTextContent > xRef =
SwXBookmark::CreateXBookmark(*GetDoc(), ppMark->get());
SwXBookmark::CreateXBookmark(*GetDoc(), *ppMark);
aRet <<= xRef;
return aRet;
}
@@ -1624,7 +1624,7 @@
uno::Any aRet;
const uno::Reference< text::XTextContent > xRef =
SwXBookmark::CreateXBookmark(*GetDoc(), ppBkmk->get());
SwXBookmark::CreateXBookmark(*GetDoc(), *ppBkmk);
aRet <<= xRef;
return aRet;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index efb4ff9..7b6cd62 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2118,9 +2118,9 @@
IDocumentMarkAccess* pMarkAccess = m_pImpl->m_pDoc->getIDocumentMarkAccess();
for (IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAnnotationMarksBegin(); ppMark != pMarkAccess->getAnnotationMarksEnd(); ++ppMark)
{
if (ppMark->get()->GetName() == pPostItField->GetName())
if ((*ppMark)->GetName() == pPostItField->GetName())
{
pPamForTextField.reset(new SwPaM(ppMark->get()->GetMarkStart(), ppMark->get()->GetMarkEnd()));
pPamForTextField.reset(new SwPaM((*ppMark)->GetMarkStart(), (*ppMark)->GetMarkEnd()));
break;
}
}
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index bba4928..30cf25a 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -194,7 +194,7 @@
ppMark != pCandidatesEnd;
++ppMark)
{
::sw::mark::IMark* const pBkmk = ppMark->get();
::sw::mark::IMark* const pBkmk = *ppMark;
lcl_FillBookmark(pBkmk, nOwnNode, rDoc, rBkmArr);
}
}
@@ -277,7 +277,7 @@
++ppMark )
{
::sw::mark::AnnotationMark* const pAnnotationMark =
dynamic_cast< ::sw::mark::AnnotationMark* >(ppMark->get());
dynamic_cast< ::sw::mark::AnnotationMark* >(*ppMark);
if (!pAnnotationMark)
continue;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index b0c6fd2..92f0e37 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1380,7 +1380,7 @@
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
{
const ::sw::mark::IMark* pBookmark = ppMark->get();
const ::sw::mark::IMark* pBookmark = *ppMark;
const sal_uLong nBookNdIdx = pBookmark->GetMarkPos().nNode.GetIndex();
if( nBookNdIdx==nNodeIdx )
@@ -1445,7 +1445,7 @@
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
{
::sw::mark::IMark* pMark = ppMark->get();
::sw::mark::IMark* pMark = *ppMark;
sal_uLong nBookNdIdx = pMark->GetMarkPos().nNode.GetIndex();
if(nBookNdIdx==nNodeIdx)
@@ -1463,7 +1463,7 @@
SwPosition aNewPos(*pNd);
aNewPos.nContent.Assign(pNd, pNd->Len());
const SwPaM aPaM(aNewPos);
pMarkAccess->repositionMark(ppMark->get(), aPaM);
pMarkAccess->repositionMark(*ppMark, aPaM);
}
}
else if( nBookNdIdx > nNodeIdx )
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index b0e9c2c..a552062 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2857,7 +2857,7 @@
IDocumentMarkAccess* const pMarkAccess = m_xDoc->getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark( sName );
if( ppBkmk != pMarkAccess->getAllMarksEnd() &&
ppBkmk->get()->GetMarkStart() == *pAttrPam->GetPoint() )
(*ppBkmk)->GetMarkStart() == *pAttrPam->GetPoint() )
break; // do not generate duplicates on this position
pAttrPam->DeleteMark();
const ::sw::mark::IMark* const pNewMark = pMarkAccess->makeMark(
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 21acd5f..51b7317 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1119,7 +1119,7 @@
const ::sw::mark::IMark* pBookmark = nullptr;
IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess();
if(m_nBkmkTabPos != -1)
pBookmark = (pMarkAccess->getAllMarksBegin() + m_nBkmkTabPos)->get();
pBookmark = pMarkAccess->getAllMarksBegin()[m_nBkmkTabPos];
// Output all bookmarks in this paragraph. The content position
// for the moment isn't considered!
sal_uInt32 nNode = m_pCurrentPam->GetPoint()->nNode.GetIndex();
@@ -1137,7 +1137,7 @@
if( ++m_nBkmkTabPos >= pMarkAccess->getAllMarksCount() )
m_nBkmkTabPos = -1;
else
pBookmark = (pMarkAccess->getAllMarksBegin() + m_nBkmkTabPos)->get();
pBookmark = pMarkAccess->getAllMarksBegin()[m_nBkmkTabPos];
}
decltype(m_aOutlineMarkPoss)::size_type nPos;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d10e54a..dc7e4e1 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1862,7 +1862,7 @@
const sal_Int32 nMarks = pMarkAccess->getAllMarksCount();
for ( sal_Int32 i = 0; i < nMarks; i++ )
{
IMark* pMark = ( pMarkAccess->getAllMarksBegin() + i )->get();
IMark* pMark = pMarkAccess->getAllMarksBegin()[i];
if ( IDocumentMarkAccess::GetType( *pMark ) == IDocumentMarkAccess::MarkType::ANNOTATIONMARK )
{
@@ -1898,7 +1898,7 @@
const sal_Int32 nMarks = pMarkAccess->getAnnotationMarksCount();
for ( sal_Int32 i = 0; i < nMarks; i++ )
{
IMark* pMark = ( pMarkAccess->getAnnotationMarksBegin() + i )->get();
IMark* pMark = pMarkAccess->getAnnotationMarksBegin()[i];
// Only keep the bookmarks starting or ending in this node
if ( pMark->GetMarkStart().nNode == nNd ||
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 67b2552..aa596ad 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1591,7 +1591,7 @@
sal_uInt16 nBkmNo;
if( IsFootnoteEdnBkmField(rFormatField, nBkmNo) )
{
::sw::mark::IMark const * const pMark = (pDoc->getIDocumentMarkAccess()->getAllMarksBegin() + nBkmNo)->get();
::sw::mark::IMark const * const pMark = pDoc->getIDocumentMarkAccess()->getAllMarksBegin()[nBkmNo];
const SwPosition& rBkMrkPos = pMark->GetMarkPos();
@@ -5348,9 +5348,9 @@
{
IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark( "_PictureBullets" );
if ( ppBkmk != pMarkAccess->getBookmarksEnd() &&
IDocumentMarkAccess::GetType( *(ppBkmk->get()) ) == IDocumentMarkAccess::MarkType::BOOKMARK )
IDocumentMarkAccess::GetType(**ppBkmk) == IDocumentMarkAccess::MarkType::BOOKMARK )
{
SwTextNode* pTextNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTextNode();
SwTextNode* pTextNode = (*ppBkmk)->GetMarkStart().nNode.GetNode().GetTextNode();
if ( pTextNode )
{
@@ -5361,7 +5361,7 @@
const sal_Int32 st = pHt->GetStart();
if( pHt
&& pHt->Which() == RES_TXTATR_FLYCNT
&& (st >= ppBkmk->get()->GetMarkStart().nContent.GetIndex()) )
&& (st >= (*ppBkmk)->GetMarkStart().nContent.GetIndex()) )
{
SwFrameFormat* pFrameFormat = pHt->GetFlyCnt().GetFrameFormat();
vecFrameFormat.push_back(pFrameFormat);
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 6017ee0..b3c9a6c 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -135,7 +135,7 @@
ppMark != pMarkAccess->getBookmarksEnd();
++ppMark)
{
const ::sw::mark::IMark* pBkmk = ppMark->get();
const ::sw::mark::IMark* pBkmk = *ppMark;
if( pBkmk->IsExpanded() )
rSubRegions.append_text( pBkmk->GetName() );
}
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 78ce06e..d034a61 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -502,7 +502,7 @@
ppMark != pMarkAccess->getBookmarksEnd();
++ppMark)
{
const ::sw::mark::IMark* pBkmk = ppMark->get();
const ::sw::mark::IMark* pBkmk = *ppMark;
if(IDocumentMarkAccess::MarkType::BOOKMARK == IDocumentMarkAccess::GetType(*pBkmk))
{
bool isSubstring = MatchSubstring(pBkmk->GetName(), filterString);
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index b7de3dc..260bb6e 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -264,8 +264,8 @@
// more bookmarks then expected
if (aListIter == aTableBookmarks.end())
return true;
if (aListIter->first != ppBookmark->get() ||
aListIter->second != ppBookmark->get()->GetName())
if (aListIter->first != *ppBookmark ||
aListIter->second != (*ppBookmark)->GetName())
return true;
++aListIter;
}
@@ -285,8 +285,8 @@
{
if (IDocumentMarkAccess::MarkType::BOOKMARK == IDocumentMarkAccess::GetType(**ppBookmark))
{
m_xBookmarksBox->InsertBookmark(ppBookmark->get());
aTableBookmarks.emplace_back(ppBookmark->get(), ppBookmark->get()->GetName());
m_xBookmarksBox->InsertBookmark(*ppBookmark);
aTableBookmarks.emplace_back(*ppBookmark, (*ppBookmark)->GetName());
}
}
m_nLastBookmarksCount = pMarkAccess->getBookmarksCount();
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 5641758..9e4852a 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -915,7 +915,7 @@
++ppMark)
{
if(IDocumentMarkAccess::MarkType::DDE_BOOKMARK == IDocumentMarkAccess::GetType(**ppMark))
vDdeMarks.push_back(ppMark->get());
vDdeMarks.push_back(*ppMark);
}
// remove all DDE-Bookmarks, they are invalid inside the clipdoc!
for(const auto& rpMark : vDdeMarks)
@@ -3982,7 +3982,7 @@
{
// the mark is still a DdeBookmark
// we replace it with a Bookmark, so it will get saved etc.
::sw::mark::IMark* const pMark = ppMark->get();
::sw::mark::IMark* const pMark = *ppMark;
::sfx2::SvLinkSource* p = refObj.get();
SwServerObject& rServerObject = dynamic_cast<SwServerObject&>(*p);
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index f17b255..044154d 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -194,10 +194,10 @@
IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess->findBookmark( sTmpSearchStr );
if ( ppBkmk != pMarkAccess->getBookmarksEnd() &&
IDocumentMarkAccess::GetType( *(ppBkmk->get()) )
IDocumentMarkAccess::GetType(**ppBkmk)
== IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK )
{
SwTextNode* pTextNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTextNode();
SwTextNode* pTextNode = (*ppBkmk)->GetMarkStart().nNode.GetNode().GetTextNode();
if ( pTextNode )
{
sText = sw::GetExpandTextMerged(rSh.GetLayout(), *pTextNode, true, false, ExpandMode(0));
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 7590d5e..1fcb920 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1660,7 +1660,7 @@
{
const IDocumentMarkAccess::const_iterator_t ppBookmark = rSh.getIDocumentMarkAccess()->getBookmarksBegin() + nIdx;
rSh.EnterStdMode();
rSh.GotoMark( ppBookmark->get() );
rSh.GotoMark( *ppBookmark );
}
else
OSL_FAIL("SwView::ExecuteStatusLine(..)"
@@ -2001,7 +2001,7 @@
}
else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) )
{
bRet = m_pWrtShell->GotoMark( ppMark->get(), false );
bRet = m_pWrtShell->GotoMark( *ppMark, false );
}
else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) {
m_pWrtShell->addCurrentPosition();
@@ -2027,7 +2027,7 @@
}
else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
{
bRet = m_pWrtShell->GotoMark( ppMark->get(), false );
bRet = m_pWrtShell->GotoMark( *ppMark, false );
}
else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) ))
bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTextINetFormat() );
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index be347f9..d6178fc 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -477,7 +477,7 @@
++ppMark)
{
if( IDocumentMarkAccess::GetType(**ppMark) == IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER )
vNavMarks.push_back(ppMark->get());
vNavMarks.push_back(*ppMark);
}
// move
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 72f7316..c432e3c 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -118,7 +118,7 @@
{
if(IDocumentMarkAccess::MarkType::BOOKMARK == IDocumentMarkAccess::GetType(**ppBookmark))
{
aPop->InsertItem( nPopupId, ppBookmark->get()->GetName() );
aPop->InsertItem( nPopupId, (*ppBookmark)->GetName() );
aBookmarkIdx[nPopupId] = static_cast<sal_uInt16>(ppBookmark - ppBookmarkStart);
nPopupId++;
}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 8106901..1549f6e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -141,9 +141,9 @@
return bFound;
}
bool lcl_IsUiVisibleBookmark(const IDocumentMarkAccess::pMark_t& rpMark)
bool lcl_IsUiVisibleBookmark(const ::sw::mark::IMark* pMark)
{
return IDocumentMarkAccess::GetType(*rpMark) == IDocumentMarkAccess::MarkType::BOOKMARK;
return IDocumentMarkAccess::GetType(*pMark) == IDocumentMarkAccess::MarkType::BOOKMARK;
}
size_t lcl_InsertURLFieldContent(
@@ -649,7 +649,7 @@
{
if(lcl_IsUiVisibleBookmark(*ppBookmark))
{
const OUString& rBkmName = ppBookmark->get()->GetName();
const OUString& rBkmName = (*ppBookmark)->GetName();
//nYPos from 0 -> text::Bookmarks will be sorted alphabetically
std::unique_ptr<SwContent> pCnt(new SwContent(this, rBkmName, 0));
m_pMember->insert(std::move(pCnt));
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 7aac5d6..e946ab0 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -507,7 +507,7 @@
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
if( IDocumentMarkAccess::GetType(**ppMark) == IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER )
vNavMarkNames.push_back(ppMark->get()->GetName());
vNavMarkNames.push_back((*ppMark)->GetName());
std::sort(vNavMarkNames.begin(), vNavMarkNames.end());
// we are maxed out and delete one
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index 4f2e8a2..7d58670 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -132,7 +132,7 @@
IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark( rName );
if (ppMark == getIDocumentMarkAccess()->getAllMarksEnd())
return;
MoveBookMark( BOOKMARK_INDEX, ppMark->get() );
MoveBookMark( BOOKMARK_INDEX, *ppMark );
}
void SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark )
@@ -151,7 +151,7 @@
bool bRet = MoveBookMark( BOOKMARK_NEXT );
if ( !bRet )
{
MoveBookMark( BOOKMARK_INDEX, getIDocumentMarkAccess()->getBookmarksBegin()->get() );
MoveBookMark( BOOKMARK_INDEX, *getIDocumentMarkAccess()->getBookmarksBegin() );
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::EndWrapped );
}
else
@@ -172,7 +172,7 @@
bool bRet = MoveBookMark( BOOKMARK_PREV );
if ( !bRet )
{
MoveBookMark( BOOKMARK_INDEX, ( getIDocumentMarkAccess()->getBookmarksEnd() - 1 )->get() );
MoveBookMark( BOOKMARK_INDEX, *( getIDocumentMarkAccess()->getBookmarksEnd() - 1 ) );
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::StartWrapped );
}
else
